From b361eafdd21ce16a4fe5ec9e03931d754569ff16 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Thu, 30 May 2013 22:54:24 +0000 Subject: [PATCH] Rearrange includes. inspired by, but not executed by, https://code.google.com/p/include-what-you-use/ git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4381 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/arcdist.cc | 3 +++ gpsbabel/axim_gpb.cc | 4 +++- gpsbabel/compegps.cc | 1 + gpsbabel/defs.h | 7 ------- gpsbabel/destinator.cc | 6 ++++-- gpsbabel/enigma.cc | 2 ++ gpsbabel/garmin.cc | 2 ++ gpsbabel/gdb.cc | 3 ++- gpsbabel/ggv_log.cc | 1 + gpsbabel/ggv_ovl.cc | 1 + gpsbabel/gpssim.cc | 2 ++ gpsbabel/gpsutil.cc | 3 +++ gpsbabel/grtcirc.cc | 3 +++ gpsbabel/height.cc | 2 ++ gpsbabel/igc.cc | 4 +++- gpsbabel/jtr.cc | 4 +++- gpsbabel/kml.cc | 10 ++++++---- gpsbabel/maggeo.cc | 2 ++ gpsbabel/magproto.cc | 1 + gpsbabel/mtk_logger.cc | 6 ++++-- gpsbabel/nmea.cc | 1 + gpsbabel/overlay.cc | 3 +++ gpsbabel/palmdoc.cc | 4 +++- gpsbabel/parse.cc | 5 +++-- gpsbabel/pathaway.cc | 3 +++ gpsbabel/pcx.cc | 3 ++- gpsbabel/position.cc | 2 ++ gpsbabel/skyforce.cc | 5 +++-- gpsbabel/skytraq.cc | 2 +- gpsbabel/tiger.cc | 2 ++ gpsbabel/tpo.cc | 6 ++++-- gpsbabel/trackfilter.cc | 2 ++ gpsbabel/unicsv.cc | 6 ++++-- gpsbabel/util.cc | 5 +++-- gpsbabel/vcf.cc | 4 +++- gpsbabel/vitosmt.cc | 3 ++- gpsbabel/waypt.cc | 2 ++ 37 files changed, 91 insertions(+), 34 deletions(-) diff --git a/gpsbabel/arcdist.cc b/gpsbabel/arcdist.cc index f622033ad..b2812494f 100644 --- a/gpsbabel/arcdist.cc +++ b/gpsbabel/arcdist.cc @@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ + +#include + #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" diff --git a/gpsbabel/axim_gpb.cc b/gpsbabel/axim_gpb.cc index 97fcf4bd8..424fc141d 100644 --- a/gpsbabel/axim_gpb.cc +++ b/gpsbabel/axim_gpb.cc @@ -20,11 +20,13 @@ */ -#include "defs.h" #include +#include #include #include +#include "defs.h" + #define MYNAME "axim_gpb" #define RECORD_LEN 344 diff --git a/gpsbabel/compegps.cc b/gpsbabel/compegps.cc index 093b818da..b078acbb7 100644 --- a/gpsbabel/compegps.cc +++ b/gpsbabel/compegps.cc @@ -61,6 +61,7 @@ #if CSVFMTS_ENABLED #include +#include #include #include #include diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 9c672699b..77d0ef73f 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -18,13 +18,6 @@ */ #ifndef gpsbabel_defs_h_included #define gpsbabel_defs_h_included -#include -#include -#include -#include -#include -#include -#include #if HAVE_CONFIG_H #include "config.h" #endif diff --git a/gpsbabel/destinator.cc b/gpsbabel/destinator.cc index e8f63d222..1de34ea3d 100644 --- a/gpsbabel/destinator.cc +++ b/gpsbabel/destinator.cc @@ -22,13 +22,15 @@ */ +#include +#include +#include + #include "defs.h" #include "cet.h" #include "cet_util.h" #include "garmin_fs.h" #include "strptime.h" -#include -#include #define MYNAME "destinator" #define DST_DYN_POI "Dynamic POI" diff --git a/gpsbabel/enigma.cc b/gpsbabel/enigma.cc index b82dd9a53..a2b4dcbdc 100644 --- a/gpsbabel/enigma.cc +++ b/gpsbabel/enigma.cc @@ -21,6 +21,8 @@ */ +#include + #include "defs.h" #define MYNAME "Enigma binary route and waypoint file format" diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc index 151dc6752..c865171f6 100644 --- a/gpsbabel/garmin.cc +++ b/gpsbabel/garmin.cc @@ -21,6 +21,8 @@ #include #include +#include + #include "defs.h" #include "grtcirc.h" #include "jeeps/gps.h" diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index 562598d61..3d679b826 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -63,9 +63,10 @@ 2008/09/11: Make format 'pipeable' (cached writes using gbfile memapi) */ +#include +#include #include #include -#include #include #include "defs.h" diff --git a/gpsbabel/ggv_log.cc b/gpsbabel/ggv_log.cc index ece06c567..5994bb6c1 100644 --- a/gpsbabel/ggv_log.cc +++ b/gpsbabel/ggv_log.cc @@ -21,6 +21,7 @@ */ #include +#include #include #include "defs.h" diff --git a/gpsbabel/ggv_ovl.cc b/gpsbabel/ggv_ovl.cc index 43a293d70..9ef4e1ca3 100644 --- a/gpsbabel/ggv_ovl.cc +++ b/gpsbabel/ggv_ovl.cc @@ -21,6 +21,7 @@ */ #include +#include #include #include diff --git a/gpsbabel/gpssim.cc b/gpsbabel/gpssim.cc index 83482989d..79b4943e1 100644 --- a/gpsbabel/gpssim.cc +++ b/gpsbabel/gpssim.cc @@ -19,6 +19,8 @@ */ +#include + #include "defs.h" #define MYNAME "gpssim" diff --git a/gpsbabel/gpsutil.cc b/gpsbabel/gpsutil.cc index 283d970dc..b1c41445f 100644 --- a/gpsbabel/gpsutil.cc +++ b/gpsbabel/gpsutil.cc @@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ + +#include + #include "defs.h" #include "magellan.h" diff --git a/gpsbabel/grtcirc.cc b/gpsbabel/grtcirc.cc index 8e98d204e..c970dddf6 100644 --- a/gpsbabel/grtcirc.cc +++ b/gpsbabel/grtcirc.cc @@ -18,8 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ + #include +#include #include + #include "defs.h" #include "grtcirc.h" diff --git a/gpsbabel/height.cc b/gpsbabel/height.cc index ba779595f..a8b471402 100644 --- a/gpsbabel/height.cc +++ b/gpsbabel/height.cc @@ -21,6 +21,8 @@ */ +#include + #include "defs.h" #include "filterdefs.h" diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc index f6aee3384..6357e22de 100644 --- a/gpsbabel/igc.cc +++ b/gpsbabel/igc.cc @@ -23,8 +23,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111 USA */ -#include "defs.h" #include +#include + +#include "defs.h" static gbfile* file_in, *file_out; static char manufacturer[4]; diff --git a/gpsbabel/jtr.cc b/gpsbabel/jtr.cc index dbeff1bc6..76bd3be09 100644 --- a/gpsbabel/jtr.cc +++ b/gpsbabel/jtr.cc @@ -21,9 +21,11 @@ */ #include -#include +#include #include #include +#include + #include "defs.h" #include "csv_util.h" #include "avltree.h" diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc index 62c9c5be9..35df16c31 100644 --- a/gpsbabel/kml.cc +++ b/gpsbabel/kml.cc @@ -20,16 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ -#include "defs.h" -#include "xmlgeneric.h" -#include "grtcirc.h" +#include +#include #ifdef __WIN32__ # include #endif +#include "defs.h" +#include "xmlgeneric.h" +#include "grtcirc.h" + #include "src/core/xmlstreamwriter.h" -#include // options static char* opt_deficon = NULL; diff --git a/gpsbabel/maggeo.cc b/gpsbabel/maggeo.cc index 1eecc0c10..996ad1516 100644 --- a/gpsbabel/maggeo.cc +++ b/gpsbabel/maggeo.cc @@ -20,6 +20,8 @@ */ #include +#include + #include "defs.h" #include "csv_util.h" #include "xmlgeneric.h" diff --git a/gpsbabel/magproto.cc b/gpsbabel/magproto.cc index 52dff2d3e..7b56c3b5c 100644 --- a/gpsbabel/magproto.cc +++ b/gpsbabel/magproto.cc @@ -21,6 +21,7 @@ */ #include +#include #include #include "defs.h" diff --git a/gpsbabel/mtk_logger.cc b/gpsbabel/mtk_logger.cc index f2bb214a4..fd2ff099d 100644 --- a/gpsbabel/mtk_logger.cc +++ b/gpsbabel/mtk_logger.cc @@ -52,11 +52,13 @@ */ +#include +#include +#include + #include "defs.h" #include "gbser.h" #include "gbfile.h" /* used for csv output */ -#include -#include #define MYNAME "mtk_logger" diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc index 5412a01e3..1584f4bd7 100644 --- a/gpsbabel/nmea.cc +++ b/gpsbabel/nmea.cc @@ -21,6 +21,7 @@ */ #include +#include #include #include "defs.h" diff --git a/gpsbabel/overlay.cc b/gpsbabel/overlay.cc index 905b20d60..5426ff365 100644 --- a/gpsbabel/overlay.cc +++ b/gpsbabel/overlay.cc @@ -25,6 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ + +#include + #include "defs.h" #include "grtcirc.h" diff --git a/gpsbabel/palmdoc.cc b/gpsbabel/palmdoc.cc index 404979566..8e3d656cd 100644 --- a/gpsbabel/palmdoc.cc +++ b/gpsbabel/palmdoc.cc @@ -22,10 +22,12 @@ */ +#include +#include + #include "defs.h" #if PDBFMTS_ENABLED #include "jeeps/gpsmath.h" -#include #include "pdbfile.h" static pdbfile *file_out; diff --git a/gpsbabel/parse.cc b/gpsbabel/parse.cc index 3167bdaef..2453f1323 100644 --- a/gpsbabel/parse.cc +++ b/gpsbabel/parse.cc @@ -20,10 +20,11 @@ */ -#include -#include #include #include +#include +#include +#include #include #include "defs.h" diff --git a/gpsbabel/pathaway.cc b/gpsbabel/pathaway.cc index f982fa18e..914b75d6f 100644 --- a/gpsbabel/pathaway.cc +++ b/gpsbabel/pathaway.cc @@ -48,7 +48,10 @@ */ + #include +#include + #include "defs.h" #if PDBFMTS_ENABLED #include "csv_util.h" diff --git a/gpsbabel/pcx.cc b/gpsbabel/pcx.cc index 0f5ca968b..979f21d8c 100644 --- a/gpsbabel/pcx.cc +++ b/gpsbabel/pcx.cc @@ -19,11 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ +#include +#include #include "defs.h" #include "garmin_tables.h" #include "csv_util.h" -#include static gbfile *file_in, *file_out; static short_handle mkshort_handle; diff --git a/gpsbabel/position.cc b/gpsbabel/position.cc index 76503cc46..95793dde4 100644 --- a/gpsbabel/position.cc +++ b/gpsbabel/position.cc @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ +#include + #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" diff --git a/gpsbabel/skyforce.cc b/gpsbabel/skyforce.cc index 8b2550387..105886148 100644 --- a/gpsbabel/skyforce.cc +++ b/gpsbabel/skyforce.cc @@ -21,11 +21,12 @@ */ -#include "defs.h" #include +#include #include -#include "strptime.h" +#include "defs.h" +#include "strptime.h" #define MYNAME "skyforce" diff --git a/gpsbabel/skytraq.cc b/gpsbabel/skytraq.cc index 465eaa2bc..05f1fe926 100644 --- a/gpsbabel/skytraq.cc +++ b/gpsbabel/skytraq.cc @@ -24,10 +24,10 @@ */ #include +#include #include "defs.h" #include "gbser.h" -//#include "jeeps/gpsmath.h" #define MYNAME "skytraq" diff --git a/gpsbabel/tiger.cc b/gpsbabel/tiger.cc index 7ceb90d32..8749c1ffe 100644 --- a/gpsbabel/tiger.cc +++ b/gpsbabel/tiger.cc @@ -19,6 +19,8 @@ */ +#include + #include "defs.h" #include "csv_util.h" diff --git a/gpsbabel/tpo.cc b/gpsbabel/tpo.cc index b76a341ef..a3638f0bf 100644 --- a/gpsbabel/tpo.cc +++ b/gpsbabel/tpo.cc @@ -70,9 +70,11 @@ 3.x "recreation" */ -#include "defs.h" -#include #include +#include +#include + +#include "defs.h" #include "jeeps/gpsmath.h" /* for datum conversions */ #define MYNAME "TPO" diff --git a/gpsbabel/trackfilter.cc b/gpsbabel/trackfilter.cc index b01a36cfa..5bcdfcc01 100644 --- a/gpsbabel/trackfilter.cc +++ b/gpsbabel/trackfilter.cc @@ -38,6 +38,8 @@ */ #include +#include + #include "defs.h" #include "filterdefs.h" #include "strptime.h" diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc index df804d2cd..f9da2f0fe 100644 --- a/gpsbabel/unicsv.cc +++ b/gpsbabel/unicsv.cc @@ -19,6 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ +#include +#include +#include + #include "defs.h" #include "cet.h" #include "cet_util.h" @@ -26,8 +30,6 @@ #include "garmin_fs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" -#include -#include #define MYNAME "unicsv" diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc index 8088a6c0f..998446fbe 100644 --- a/gpsbabel/util.cc +++ b/gpsbabel/util.cc @@ -22,11 +22,12 @@ #include "defs.h" #include "jeeps/gpsmath.h" -#include -#include #include #include +#include #include +#include +#include #include // First test Apple's clever macro that's really a runtime test so diff --git a/gpsbabel/vcf.cc b/gpsbabel/vcf.cc index 9c76a6359..1070bba5a 100644 --- a/gpsbabel/vcf.cc +++ b/gpsbabel/vcf.cc @@ -19,9 +19,11 @@ */ +#include +#include + #include "defs.h" #include "jeeps/gpsmath.h" -#include static gbfile *file_out; static short_handle mkshort_handle; diff --git a/gpsbabel/vitosmt.cc b/gpsbabel/vitosmt.cc index 72f365aec..0fbbd89ee 100644 --- a/gpsbabel/vitosmt.cc +++ b/gpsbabel/vitosmt.cc @@ -19,10 +19,11 @@ */ +#include +#include #include #include #include -#include #define MYNAME "vitosmt" #include "defs.h" diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc index 6dbfaa3a7..4df831532 100644 --- a/gpsbabel/waypt.cc +++ b/gpsbabel/waypt.cc @@ -20,6 +20,8 @@ */ #include +#include + #include "defs.h" #include "cet_util.h" #include "grtcirc.h" -- 2.30.2